asure that the type system has been initialized.

Thu May  7 19:03:50 1998  Tim Janik  <timj@gtk.org>

        * gtk/gtktypeutils.c (gtk_type_unique): asure that the type system has
                been initialized.

diff --git a/ChangeLog b/ChangeLog
index 6efa0c6aa08011d8d264c16fe0f89f5f270e9609..5631c929b260fab59c63bd3ba690ac8b092296b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  7 19:03:50 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktypeutils.c (gtk_type_unique): asure that the type system has
+       been initialized.
+
 Thu May  7 12:52:45 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.c (gtk_object_set_data_by_id_full): allocate object

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6efa0c6aa08011d8d264c16fe0f89f5f270e9609..5631c929b260fab59c63bd3ba690ac8b092296b7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu May  7 19:03:50 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktypeutils.c (gtk_type_unique): asure that the type system has
+       been initialized.
+
 Thu May  7 12:52:45 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.c (gtk_object_set_data_by_id_full): allocate object

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6efa0c6aa08011d8d264c16fe0f89f5f270e9609..5631c929b260fab59c63bd3ba690ac8b092296b7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu May  7 19:03:50 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktypeutils.c (gtk_type_unique): asure that the type system has
+       been initialized.
+
 Thu May  7 12:52:45 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.c (gtk_object_set_data_by_id_full): allocate object

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6efa0c6aa08011d8d264c16fe0f89f5f270e9609..5631c929b260fab59c63bd3ba690ac8b092296b7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu May  7 19:03:50 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktypeutils.c (gtk_type_unique): asure that the type system has
+       been initialized.
+
 Thu May  7 12:52:45 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.c (gtk_object_set_data_by_id_full): allocate object

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6efa0c6aa08011d8d264c16fe0f89f5f270e9609..5631c929b260fab59c63bd3ba690ac8b092296b7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu May  7 19:03:50 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktypeutils.c (gtk_type_unique): asure that the type system has
+       been initialized.
+
 Thu May  7 12:52:45 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.c (gtk_object_set_data_by_id_full): allocate object

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6efa0c6aa08011d8d264c16fe0f89f5f270e9609..5631c929b260fab59c63bd3ba690ac8b092296b7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu May  7 19:03:50 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktypeutils.c (gtk_type_unique): asure that the type system has
+       been initialized.
+
 Thu May  7 12:52:45 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.c (gtk_object_set_data_by_id_full): allocate object

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6efa0c6aa08011d8d264c16fe0f89f5f270e9609..5631c929b260fab59c63bd3ba690ac8b092296b7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu May  7 19:03:50 1998  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtktypeutils.c (gtk_type_unique): asure that the type system has
+       been initialized.
+
 Thu May  7 12:52:45 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkobject.c (gtk_object_set_data_by_id_full): allocate object

diff --git a/gtk/gtktypeutils.c b/gtk/gtktypeutils.c
index 5bf4028266e57b66e02d434107f64831825228bf..e84f2b735f4a88c28c9452578216a682075336cf 100644 (file)
--- a/gtk/gtktypeutils.c
+++ b/gtk/gtktypeutils.c
@@ -130,6 +130,10 @@ gtk_type_unique (GtkType      parent_type,
   guint i;
 
   g_return_val_if_fail (type_info != NULL, 0);
+
+  if (n_type_nodes == 0)
+    gtk_type_init ();
+
   if (g_hash_table_lookup (type_name_2_type_ht, type_info->type_name))
     {
       g_warning ("gtk_type_unique(): type `%s' already exists.", type_info->type_name);

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index 7097d08a5be84f5a1e2f9dac7991e85dd62ba6ed..df5936d4fcf42fd1b585c5b89958fd2213073672 100644 (file)
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -2028,7 +2028,7 @@ create_menus (void)
       gtk_signal_connect (GTK_OBJECT (window), "destroy",
                          GTK_SIGNAL_FUNC(gtk_widget_destroyed),
                          &window);
-      gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+      gtk_signal_connect (GTK_OBJECT (window), "delete-event",
                          GTK_SIGNAL_FUNC (gtk_true),
                          NULL);
 
@@ -5144,7 +5144,7 @@ dnd_drop (GtkWidget *button, GdkEvent *event)
   gtk_signal_connect (GTK_OBJECT (window), "destroy",
                      GTK_SIGNAL_FUNC(dnd_drop_destroy_popup),
                      &window);
-  gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+  gtk_signal_connect (GTK_OBJECT (window), "delete-event",
                      GTK_SIGNAL_FUNC(gtk_false),
                      &window);
 
@@ -6642,7 +6642,7 @@ create_main_window (void)
   gtk_signal_connect (GTK_OBJECT (window), "destroy",
                      GTK_SIGNAL_FUNC(gtk_main_quit),
                      NULL);
-  gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+  gtk_signal_connect (GTK_OBJECT (window), "delete-event",
                      GTK_SIGNAL_FUNC (gtk_false),
                      NULL);
 

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 7097d08a5be84f5a1e2f9dac7991e85dd62ba6ed..df5936d4fcf42fd1b585c5b89958fd2213073672 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2028,7 +2028,7 @@ create_menus (void)
       gtk_signal_connect (GTK_OBJECT (window), "destroy",
                          GTK_SIGNAL_FUNC(gtk_widget_destroyed),
                          &window);
-      gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+      gtk_signal_connect (GTK_OBJECT (window), "delete-event",
                          GTK_SIGNAL_FUNC (gtk_true),
                          NULL);
 
@@ -5144,7 +5144,7 @@ dnd_drop (GtkWidget *button, GdkEvent *event)
   gtk_signal_connect (GTK_OBJECT (window), "destroy",
                      GTK_SIGNAL_FUNC(dnd_drop_destroy_popup),
                      &window);
-  gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+  gtk_signal_connect (GTK_OBJECT (window), "delete-event",
                      GTK_SIGNAL_FUNC(gtk_false),
                      &window);
 
@@ -6642,7 +6642,7 @@ create_main_window (void)
   gtk_signal_connect (GTK_OBJECT (window), "destroy",
                      GTK_SIGNAL_FUNC(gtk_main_quit),
                      NULL);
-  gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+  gtk_signal_connect (GTK_OBJECT (window), "delete-event",
                      GTK_SIGNAL_FUNC (gtk_false),
                      NULL);